Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add LightningDataModule.load_from_checkpoint to load datamodules directly from checkpoint #12550

Merged
merged 12 commits into from
May 3, 2022
Merged

Add LightningDataModule.load_from_checkpoint to load datamodules directly from checkpoint #12550

merged 12 commits into from
May 3, 2022

Conversation

rohitgr7
Copy link
Contributor

@rohitgr7 rohitgr7 commented Mar 31, 2022 •
edited by Borda
Loading

What does this PR do?

Fixes #12062

Does your PR introduce any breaking changes? If yes, please list them.

Before submitting

  • Was this discussed/approved via a GitHub issue? (not for typos and docs)
  • Did you read the contributor guideline, Pull Request section?
  • Did you make sure your PR does only one thing, instead of bundling different changes together?
  • Did you make sure to update the documentation with your changes? (if necessary)
  • Did you write any new necessary tests? (not for typos and docs)
  • Did you verify new and existing tests pass locally with your changes?
  • Did you list all the breaking changes introduced by this pull request?
  • Did you update the CHANGELOG? (not for typos, docs, test updates, or internal minor changes/refactorings)

PR review

Anyone in the community is welcome to review the PR.
Before you start reviewing make sure you have read Review guidelines. In short, see the following bullet-list:

  • Is this pull request ready for review? (if not, please submit in draft mode)
  • Check that all items from Before submitting are resolved
  • Make sure the title is self-explanatory and the description concisely explains the PR
  • Add labels and milestones (and optionally projects) to the PR so it can be classified

Did you have fun?

Make sure you had fun coding 🙃

cc @carmocca @awaelchli @Borda @ananthsub @ninginthecloud @jjenniferdai @rohitgr7

@rohitgr7 rohitgr7 added argparse (removed) Related to argument parsing (argparse, Hydra, ...) lightningdatamodule pl.LightningDataModule labels Mar 31, 2022
@rohitgr7 rohitgr7 added this to the 1.7 milestone Mar 31, 2022
@rohitgr7 rohitgr7 changed the title Add LightningDataModule.load_from_checkpoint to load datamodules directly from checkpoint Add LightningDataModule.load_from_checkpoint to load datamodules directly from checkpoint Mar 31, 2022
@rohitgr7 rohitgr7 marked this pull request as ready for review April 1, 2022 07:55
carmocca
carmocca approved these changes Apr 1, 2022
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
pytorch_lightning/core/datamodule.py Show resolved Hide resolved
pytorch_lightning/core/saving.py Outdated Show resolved Hide resolved
pytorch_lightning/trainer/connectors/checkpoint_connector.py Outdated Show resolved Hide resolved
pytorch_lightning/core/saving.py Outdated Show resolved Hide resolved
pytorch_lightning/core/saving.py Outdated Show resolved Hide resolved
pytorch_lightning/core/saving.py Outdated Show resolved Hide resolved
pytorch_lightning/core/saving.py Outdated Show resolved Hide resolved
rohitgr7 and others added 4 commits April 4, 2022 18:24
@rohitgr7 @carmocca
Apply suggestions from code review
78802b8 
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
@rohitgr7
use instance
3a632d1
@rohitgr7
avoid dup
bee09ba
@Borda @carmocca
Apply suggestions from code review
1a23a46 
Co-authored-by: Carlos Mocholí <carlossmocholi@gmail.com>
@mergify mergify bot removed the has conflicts label Apr 26, 2022
@mergify mergify bot added the ready PRs ready to be merged label Apr 26, 2022
@otaj otaj enabled auto-merge (squash) April 28, 2022 14:14
awaelchli
awaelchli reviewed Apr 28, 2022
View reviewed changes
Copy link
Contributor

@awaelchli awaelchli left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a nice feature addition!

I have one concern question where I believe we should look for a decision before merging the PR.
In #10375 I propose to deprecate support for saving and restoring from a singular hparams container passed as input argument. If we decide to do this deprecation in this release, it would be better if the implementation here would already adopt the new restricted (simpler) way of parsing the args. If you think this is less convenient, then I'm also good with this. I just want to avoid us introducing a new feature with a broader scope and immediately deprecate partial functionality.

cc @carmocca

docs/source/common/checkpointing_basic.rst Show resolved Hide resolved
@rohitgr7
Copy link
Contributor Author

rohitgr7 commented May 2, 2022

This is a nice feature addition!

I have one concern question where I believe we should look for a decision before merging the PR. In #10375 I propose to deprecate support for saving and restoring from a singular hparams container passed as input argument. If we decide to do this deprecation in this release, it would be better if the implementation here would already adopt the new restricted (simpler) way of parsing the args. If you think this is less convenient, then I'm also good with this. I just want to avoid us introducing a new feature with a broader scope and immediately deprecate partial functionality.

cc @carmocca

let's do it in this release in a follow-up. I have seen similar issues related to it on slack so would be worth restricting the containers here.

@rohitgr7 rohitgr7 requested a review from awaelchli May 2, 2022 15:26
Borda
Borda approved these changes May 2, 2022
View reviewed changes
Copy link
Member

@Borda Borda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Borda
Borda reviewed May 3, 2022
View reviewed changes
Copy link
Member

@Borda Borda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.

@otaj otaj merged commit cd01856 into master May 3, 2022
@otaj otaj deleted the feat/dm_load_from_checkpoint branch May 3, 2022 12:27
@awaelchli awaelchli mentioned this pull request Sep 24, 2022
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@carmocca carmocca carmocca approved these changes

@Borda Borda Borda approved these changes

@kaushikb11 kaushikb11 kaushikb11 approved these changes

@otaj otaj otaj approved these changes

@williamFalcon williamFalcon Awaiting requested review from williamFalcon

@ananthsub ananthsub Awaiting requested review from ananthsub

@tchaton tchaton Awaiting requested review from tchaton tchaton is a code owner

@SeanNaren SeanNaren Awaiting requested review from SeanNaren

@justusschock justusschock Awaiting requested review from justusschock justusschock is a code owner

@edenlightning edenlightning Awaiting requested review from edenlightning

@awaelchli awaelchli Awaiting requested review from awaelchli

Assignees
No one assigned
Labels
argparse (removed) Related to argument parsing (argparse, Hydra, ...) lightningdatamodule pl.LightningDataModule ready PRs ready to be merged
Projects
None yet
Milestone
pl:1.7
Development

Successfully merging this pull request may close these issues.

Datamodule's hparams should be saved inside checkpoint
6 participants
@rohitgr7 @awaelchli @Borda @otaj @carmocca @kaushikb11